From d84c659b3a4e3ab17fc30fa68d86c68c88898330 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 10 May 2007 15:18:27 -0600 Subject: [PATCH] [IA64] Quiet lookup_domain_mpa() when domain is dying. Message clean up in lookup_domain_mpa(). It is possible that current != d. This patch addresses xensource bugzilla #944 Signed-off-by: Isaku Yamahata --- xen/arch/ia64/xen/mm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c index d2fb513125..367ed5a0dd 100644 --- a/xen/arch/ia64/xen/mm.c +++ b/xen/arch/ia64/xen/mm.c @@ -666,19 +666,22 @@ unsigned long lookup_domain_mpa(struct domain *d, unsigned long mpaddr, return GPFN_INV_MASK; } - if (mpaddr < d->arch.convmem_end) { + if (mpaddr < d->arch.convmem_end && !d->is_dying) { gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: non-allocated mpa " - "0x%lx (< 0x%lx)\n", current->vcpu_id, PSCB(current, iip), - mpaddr, d->arch.convmem_end); + "d %"PRId16" 0x%lx (< 0x%lx)\n", + current->vcpu_id, PSCB(current, iip), + d->domain_id, mpaddr, d->arch.convmem_end); } else if (mpaddr - IO_PORTS_PADDR < IO_PORTS_SIZE) { /* Log I/O port probing, but complain less loudly about it */ gdprintk(XENLOG_INFO, "vcpu %d iip 0x%016lx: bad I/O port access " - "0x%lx\n", current->vcpu_id, PSCB(current, iip), + "d %"PRId16" 0x%lx\n", + current->vcpu_id, PSCB(current, iip), d->domain_id, IO_SPACE_SPARSE_DECODING(mpaddr - IO_PORTS_PADDR)); } else { - gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: bad mpa 0x%lx " - "(=> 0x%lx)\n", current->vcpu_id, PSCB(current, iip), - mpaddr, d->arch.convmem_end); + gdprintk(XENLOG_WARNING, "vcpu %d iip 0x%016lx: bad mpa " + "d %"PRId16" 0x%lx (=> 0x%lx)\n", + current->vcpu_id, PSCB(current, iip), + d->domain_id, mpaddr, d->arch.convmem_end); } if (entry != NULL) -- 2.30.2